core: Add definitions for GPG signature metadata

_OSTREE_METADATA_GPGSIGS_NAME
_OSTREE_METADATA_GPGSIGS_TYPE

diff --git a/src/libostree/ostree-core-private.h b/src/libostree/ostree-core-private.h
index 8d6cb93ba311dac1e3f0db84c857b0c2c1f5228e..f78a820c0ec26fbcdf6a7acff002fe73b7c5ce86 100644 (file)
--- a/src/libostree/ostree-core-private.h
+++ b/src/libostree/ostree-core-private.h
@@ -125,6 +125,9 @@ _ostree_loose_path_with_suffix (char              *buf,
                                 OstreeRepoMode     repo_mode,
                                 const char        *suffix);
 
+#define _OSTREE_METADATA_GPGSIGS_NAME "ostree.gpgsigs"
+#define _OSTREE_METADATA_GPGSIGS_TYPE G_VARIANT_TYPE ("aay")
+
 GVariant *
 _ostree_detached_metadata_append_gpg_sig (GVariant   *existing_metadata,
                                           GBytes     *signature_bytes);

diff --git a/src/libostree/ostree-core.c b/src/libostree/ostree-core.c
index 9a4aa0f50404f1adbeabc18cbc6ba92e9939c692..83aa688daf9096f821651489ec187df00ea4f34c 100644 (file)
--- a/src/libostree/ostree-core.c
+++ b/src/libostree/ostree-core.c
@@ -1933,18 +1933,18 @@ _ostree_detached_metadata_append_gpg_sig (GVariant   *existing_metadata,
   if (existing_metadata)
     {
       builder = ot_util_variant_builder_from_variant (existing_metadata, G_VARIANT_TYPE ("a{sv}"));
-      signaturedata = g_variant_lookup_value (existing_metadata, "ostree.gpgsigs", G_VARIANT_TYPE ("aay"));
+      signaturedata = g_variant_lookup_value (existing_metadata, _OSTREE_METADATA_GPGSIGS_NAME, _OSTREE_METADATA_GPGSIGS_TYPE);
       if (signaturedata)
-        signature_builder = ot_util_variant_builder_from_variant (signaturedata, G_VARIANT_TYPE ("aay"));
+        signature_builder = ot_util_variant_builder_from_variant (signaturedata, _OSTREE_METADATA_GPGSIGS_TYPE);
     }
   if (!builder)
     builder = g_variant_builder_new (G_VARIANT_TYPE ("a{sv}"));
   if (!signature_builder)
-    signature_builder = g_variant_builder_new (G_VARIANT_TYPE ("aay"));
+    signature_builder = g_variant_builder_new (_OSTREE_METADATA_GPGSIGS_TYPE);
 
   g_variant_builder_add (signature_builder, "@ay", ot_gvariant_new_ay_bytes (signature_bytes));
 
-  g_variant_builder_add (builder, "{sv}", "ostree.gpgsigs", g_variant_builder_end (signature_builder));
+  g_variant_builder_add (builder, "{sv}", _OSTREE_METADATA_GPGSIGS_NAME, g_variant_builder_end (signature_builder));
   
   return g_variant_ref_sink (g_variant_builder_end (builder));
 }

diff --git a/src/libostree/ostree-repo.c b/src/libostree/ostree-repo.c
index a05d481d73271ec4f82a5186535321a4ede23919..d8e5ab7c21e946fdd1104f3fdaec6fccb6f78104 100644 (file)
--- a/src/libostree/ostree-repo.c
+++ b/src/libostree/ostree-repo.c
@@ -3312,7 +3312,9 @@ _ostree_repo_gpg_verify_file_with_metadata (OstreeRepo          *self,
     }
 
   if (metadata)
-    signaturedata = g_variant_lookup_value (metadata, "ostree.gpgsigs", G_VARIANT_TYPE ("aay"));
+    signaturedata = g_variant_lookup_value (metadata,
+                                            _OSTREE_METADATA_GPGSIGS_NAME,
+                                            _OSTREE_METADATA_GPGSIGS_TYPE);
   if (!signaturedata)
     {
       g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND,